From 519822976fe8c71c381866f6dc5f1b98ad356d43 Mon Sep 17 00:00:00 2001 From: robertlipe Date: Sun, 14 Jul 2013 21:07:22 +0000 Subject: [PATCH] Rename jeeps/gpsutil.cc->jeeps/jgpsutil.cc. No reasont to keep fighting both MSVC and qMake over this. --- gpsbabel/Makefile.in | 4 ++-- gpsbabel/jeeps/{gpsutil.cc => jgpsutil.cc} | 0 gpsbabel/msvc/GPSBabel.vcxproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename gpsbabel/jeeps/{gpsutil.cc => jgpsutil.cc} (100%) diff --git a/gpsbabel/Makefile.in b/gpsbabel/Makefile.in index 915ee68c1..d54d322b0 100644 --- a/gpsbabel/Makefile.in +++ b/gpsbabel/Makefile.in @@ -95,7 +95,7 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \ jeeps/gpsmath.o jeeps/gpsmem.o \ jeeps/gpsprot.o jeeps/gpsread.o \ jeeps/gpsdevice.o jeeps/gpsdevice_ser.o jeeps/gpsdevice_usb.o \ - jeeps/gpsrqst.o jeeps/gpssend.o jeeps/gpsserial.o jeeps/gpsutil.o \ + jeeps/gpsrqst.o jeeps/gpssend.o jeeps/gpsserial.o jeeps/jgpsutil.o \ jeeps/gpsusbread.o jeeps/gpsusbsend.o \ jeeps/gpsusbcommon.o @OSJEEPS@ @@ -888,7 +888,7 @@ jeeps/gpsusbsend.o: jeeps/gpsusbsend.cc jeeps/gps.h jeeps/../defs.h \ jeeps/gpsapp.h jeeps/gpsprot.h jeeps/gpscom.h jeeps/gpsfmt.h \ jeeps/gpsmath.h jeeps/gpsmem.h jeeps/gpsrqst.h jeeps/gpsinput.h \ jeeps/gpsproj.h jeeps/garminusb.h jeeps/gpsusbint.h -jeeps/gpsutil.o: jeeps/gpsutil.cc jeeps/gps.h jeeps/../defs.h \ +jeeps/jgpsutil.o: jeeps/jgpsutil.cc jeeps/gps.h jeeps/../defs.h \ jeeps/../config.h jeeps/../queue.h jeeps/../gbtypes.h \ jeeps/../zlib/zlib.h jeeps/../zlib/zconf.h jeeps/../gbfile.h \ jeeps/../defs.h jeeps/../cet.h jeeps/../cet_util.h jeeps/../inifile.h \ diff --git a/gpsbabel/jeeps/gpsutil.cc b/gpsbabel/jeeps/jgpsutil.cc similarity index 100% rename from gpsbabel/jeeps/gpsutil.cc rename to gpsbabel/jeeps/jgpsutil.cc diff --git a/gpsbabel/msvc/GPSBabel.vcxproj b/gpsbabel/msvc/GPSBabel.vcxproj index 252bca73e..1cd0c3fdc 100644 --- a/gpsbabel/msvc/GPSBabel.vcxproj +++ b/gpsbabel/msvc/GPSBabel.vcxproj @@ -3150,7 +3150,7 @@ >